* lisp/files.el (diff-no-select): Declare.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32060096aa7adc281e459d228ce838dcebcd0850..4043498c2e5091268ce786666a48dbdce701eb84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-12-10  Glenn Morris  <rgm@gnu.org>
 
+       * files.el (diff-no-select): Declare.
+
        * mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
        (report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.
 

diff --git a/lisp/files.el b/lisp/files.el
index 43ba34f8beff47686536fbe4a743dabb5b7f7611..09e2a4e072595b1f2618b933eca18ea04aa708c4 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4500,6 +4500,9 @@ Before and after saving the buffer, this function runs
                   (setq buffer-backed-up nil))))))
     setmodes))
 
+(declare-function diff-no-select "diff"
+                 (old new &optional switches no-async buf))
+
 (defvar save-some-buffers-action-alist
   `((?\C-r
      ,(lambda (buf)